From: Anthony PERARD Date: Thu, 19 Oct 2017 14:29:56 +0000 (+0100) Subject: tools/Makefile: unset MAKELEVEL before building QEMU X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1074 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=575da5ceb427ce649eb22c1aea105af147d22487;p=xen.git tools/Makefile: unset MAKELEVEL before building QEMU Since QEMU commits aef45d51d1204f3335fb99de6658e0c5612c2b67 "build: automatically handle GIT submodule checkout for dtc" the QEMU makefiles rely on the variable MAKELEVEL to make a decision on whether to update some git submodules or not. Since we call QEMU build from within the Xen one, MAKELEVEL would already be greater than 0 and the git submodules would not be updated and QEMU would fail to build. Fix this by removing MAKELEVEL from the environment before trying to build QEMU. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson Release-acked-by: Julien Grall --- diff --git a/tools/Makefile b/tools/Makefile index 84d6e3b4e4..ab7a01ee1b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -217,6 +217,7 @@ QEMU_XEN_ENABLE_DEBUG := endif subdir-all-qemu-xen-dir: qemu-xen-dir-find + unset MAKELEVEL; \ if test -d $(QEMU_UPSTREAM_LOC) ; then \ source=$(QEMU_UPSTREAM_LOC); \ else \